From 21ac7c5fddfc210136c73a54281700285dbc2ea4 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Fri, 27 Apr 2007 12:51:14 +0100 Subject: [PATCH] [XM] Differentiate between VLAN PIFs and normal PIFs in network-show signed-off-by: Tom Wilkie --- tools/python/xen/xm/main.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 467b42fda3..f1bed2d195 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -2301,11 +2301,19 @@ def xm_network_show(args): else: vif = '' + if pif: + if int(pif['VLAN']) > -1: + pif = '%s.%s' % (pif['device'], pif['VLAN']) + else: + pif = pif['device'] + else: + pif = '' + if i == 0: r = {'name_label':network['name_label'], - 'vif':vif, 'pif':pif['device']} + 'vif':vif, 'pif':pif} else: - r = {'name_label':'','vif':vif,'pif':pif['device']} + r = {'name_label':'', 'vif':vif, 'pif':pif} print format2 % r -- 2.30.2